From 53a1f0ba7822d314003a170dc2c905af6f4b0cbb Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sat, 9 Jul 2016 00:56:32 +0200 Subject: [PATCH] Adwaita: remove old popover checkbutton/radiobutton style remove some now disfunctional style regarding checkbuttons and radiobuttons inside popovers which shouldn't be needed anymore. --- gtk/theme/Adwaita/_common.scss | 3 -- gtk/theme/Adwaita/gtk-contained-dark.css | 40 ++++++++---------------- gtk/theme/Adwaita/gtk-contained.css | 40 ++++++++---------------- 3 files changed, 26 insertions(+), 57 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index b5cac09799..b898cd33d0 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1994,9 +1994,6 @@ popover.background { separator { margin: 3px; } list separator { margin: 0px; } - - checkbutton, - radiobutton { @extend modelbutton.flat; } } /************* diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index b4311a35de..ad265d2a2e 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1336,11 +1336,8 @@ button:only-child, .linked.vertical > combobox:only-child > box > button.combo { border-radius: 3px; border-style: solid; } -modelbutton.flat, popover.background checkbutton, -popover.background radiobutton, -.menuitem.button.flat, modelbutton.flat:backdrop, popover.background checkbutton:backdrop, -popover.background radiobutton:backdrop, modelbutton.flat:backdrop:hover, popover.background checkbutton:backdrop:hover, -popover.background radiobutton:backdrop:hover, +modelbutton.flat, +.menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, button:link, button:visited, button:link:hover, button:link:active, button:link:checked, @@ -1355,30 +1352,24 @@ button:visited:checked, calendar.button, calendar.button:hover, calendar.button: -gtk-icon-shadow: none; } /* menu buttons */ -modelbutton.flat, popover.background checkbutton, -popover.background radiobutton, +modelbutton.flat, .menuitem.button.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 3px; outline-offset: -2px; } - modelbutton.flat:hover, popover.background checkbutton:hover, - popover.background radiobutton:hover, + modelbutton.flat:hover, .menuitem.button.flat:hover { background-color: #3f4649; } -modelbutton.flat arrow, popover.background checkbutton arrow, -popover.background radiobutton arrow { +modelbutton.flat arrow { background: none; } - modelbutton.flat arrow:hover, popover.background checkbutton arrow:hover, - popover.background radiobutton arrow:hover { + modelbutton.flat arrow:hover { background: none; } - modelbutton.flat arrow.left, popover.background checkbutton arrow.left, - popover.background radiobutton arrow.left { + modelbutton.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } - modelbutton.flat arrow.right, popover.background checkbutton arrow.right, - popover.background radiobutton arrow.right { + modelbutton.flat arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } button.color { @@ -4501,8 +4492,7 @@ iconview text:selected, textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, -entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, -popover.background radiobutton:selected, +entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { background-color: #215d9c; } row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, @@ -4514,8 +4504,7 @@ popover.background radiobutton:selected, textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, - entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, - popover.background radiobutton:selected, + entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { color: #ffffff; } row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, @@ -4525,8 +4514,7 @@ popover.background radiobutton:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, - entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected, - popover.background radiobutton:disabled:selected, + entry selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected { color: #90aece; } row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, @@ -4536,8 +4524,7 @@ popover.background radiobutton:selected, iconview text:backdrop:selected, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop, - entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, - popover.background radiobutton:backdrop:selected, + entry selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected { color: #d3d4d5; } row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, @@ -4545,8 +4532,7 @@ popover.background radiobutton:selected, iconview text:backdrop:disabled:selected, textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled, textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, - entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected, - popover.background radiobutton:backdrop:disabled:selected, + entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected { color: #5681ad; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 6cfc3d216a..243cf3575a 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1339,11 +1339,8 @@ button:only-child, .linked.vertical > combobox:only-child > box > button.combo { border-radius: 3px; border-style: solid; } -modelbutton.flat, popover.background checkbutton, -popover.background radiobutton, -.menuitem.button.flat, modelbutton.flat:backdrop, popover.background checkbutton:backdrop, -popover.background radiobutton:backdrop, modelbutton.flat:backdrop:hover, popover.background checkbutton:backdrop:hover, -popover.background radiobutton:backdrop:hover, +modelbutton.flat, +.menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, button:link, button:visited, button:link:hover, button:link:active, button:link:checked, @@ -1358,30 +1355,24 @@ button:visited:checked, calendar.button, calendar.button:hover, calendar.button: -gtk-icon-shadow: none; } /* menu buttons */ -modelbutton.flat, popover.background checkbutton, -popover.background radiobutton, +modelbutton.flat, .menuitem.button.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 3px; outline-offset: -2px; } - modelbutton.flat:hover, popover.background checkbutton:hover, - popover.background radiobutton:hover, + modelbutton.flat:hover, .menuitem.button.flat:hover { background-color: #f4f4f4; } -modelbutton.flat arrow, popover.background checkbutton arrow, -popover.background radiobutton arrow { +modelbutton.flat arrow { background: none; } - modelbutton.flat arrow:hover, popover.background checkbutton arrow:hover, - popover.background radiobutton arrow:hover { + modelbutton.flat arrow:hover { background: none; } - modelbutton.flat arrow.left, popover.background checkbutton arrow.left, - popover.background radiobutton arrow.left { + modelbutton.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } - modelbutton.flat arrow.right, popover.background checkbutton arrow.right, - popover.background radiobutton arrow.right { + modelbutton.flat arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } button.color { @@ -4532,8 +4523,7 @@ iconview text:selected, textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, -entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, -popover.background radiobutton:selected, +entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { background-color: #4a90d9; } row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, @@ -4545,8 +4535,7 @@ popover.background radiobutton:selected, textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, - entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, - popover.background radiobutton:selected, + entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { color: #ffffff; } row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, @@ -4556,8 +4545,7 @@ popover.background radiobutton:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, - entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected, - popover.background radiobutton:disabled:selected, + entry selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected { color: #a5c8ec; } row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, @@ -4567,8 +4555,7 @@ popover.background radiobutton:selected, iconview text:backdrop:selected, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop, - entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, - popover.background radiobutton:backdrop:selected, + entry selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected { color: #fcfcfc; } row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, @@ -4576,8 +4563,7 @@ popover.background radiobutton:selected, iconview text:backdrop:disabled:selected, textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled, textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, - entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected, - popover.background radiobutton:backdrop:disabled:selected, + entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected { color: #7fb0e4; } -- 2.30.2